Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 03:40:18 +0000 (20:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 13 Jul 2011 03:40:18 +0000 (20:40 -0700)
commit799e28d081b5a1d1b3ef40260a923c4ba00a3dc2
tree75941a454f3143bbaea155e06aeebea7a0937fb1
parent507d8a64f178e549bddf7fa656ad0d6225ec7567
parent78b052c5f6fe67a2fa06970ea86a07c4ddb71c5c
Merge from trunk.